Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Sat, 24 Nov 2012 12:48:55 +0000 (14:48 +0200)
committerEli Zaretskii <eliz@gnu.org>
Sat, 24 Nov 2012 12:48:55 +0000 (14:48 +0200)
commit8a4e2455020d9ab7e35ebfd15064a5fe964b4945
treea8a579f6143f0130eac96fb097cbf56333cacca2
parent1ed02d22df437c7571baccf9295aa3c8d0b13788
parent00904271c8beeb82c947420a591ec0e8ffdf9181
Merge from trunk.